#23 Changed the way the sidebar is being added by AngularJS
#23 Merge branch 'origin/develop'

Conflicts:
	lib/sdk/bin/joola.io.js