Merge branch 'development'
authorDarren <darren@darrenwhitlen.com>
Mon, 26 Jan 2015 11:19:17 +0000 (11:19 +0000)
committerDarren <darren@darrenwhitlen.com>
Mon, 26 Jan 2015 11:19:17 +0000 (11:19 +0000)
commitcd9dd99d384873a4c47d77047a3a29f5de52c3c4
tree1c3a53f36dca5a6d68c664f61053911db273cc2d
parentde1607bf1e9ba4429a10f895a6ec45c54daa3161
parent7b506f74f8586bca512b05dcfc00cd69dbff9cc2
Merge branch 'development'

Conflicts:
client/src/applets/startup.js