Updated channels modal form to prevent routes from being lost/removed when being editted
Started coding the user group access control for the sidebar
Merge branch 'master' of https://github.com/jembi/openhim-console into sidebarAccessControl

Conflicts:
	app/views/sidebar.html
Restricting access to sidebar menu items for non admin users
Removed dummy code from sidebar
Updated sidebar.html file with comment
Fixed jshint errors
Updated login test script - A few minor changes/additions to login script
Updated script with minor syntax/JSHint fixes
Minor text change
Manual merging with Master
Manually merging with master
Updated script to fix JSHint errors
Merge pull request #55 from jembi/channelsFormBug

Channels Form Bug - closes #29
Updated session to store user groups - updated app.js to set admin variable each route change
Merge pull request #61 from jembi/sidebarAccessControl

Sidebar access control - closes #51
Merge branch 'master' of https://github.com/jembi/openhim-console into sidebar-edits

Conflicts:
	app/views/sidebar.html