Merge branch 'development' into channel_info
authorDarren <darren@darrenwhitlen.com>
Mon, 6 Jan 2014 10:54:16 +0000 (10:54 +0000)
committerDarren <darren@darrenwhitlen.com>
Mon, 6 Jan 2014 10:54:16 +0000 (10:54 +0000)
commite7bc26f94d2e303f15fe24af895633cc0795e50d
treea4b01b2f81ac6a406d7811d6ecad0a4d0ee0e87e
parent63a887cd40e7ae0183fcbf0e57aac16c6d850ed5
parente5baa247b7c7d079af4a6a70f2f91909d7a6360f
Merge branch 'development' into channel_info

Conflicts:
client/src/index.html.tmpl
client/src/app.js
client/src/index.html.tmpl
client/src/models/application.js
client/src/models/gateway.js