chore: styling example app
chore: styling example app
chore: ngdocs included
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gruntfile.js
	package.json
fix: documentation in lx_socket was wrong
Merge remote-tracking branch 'origin/master'
fix: documentation in lx_socket was wrong
Merge remote-tracking branch 'origin/master'
chore: acl check with roles only
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/examples.html
	app/lib/lx_navigation/lx_navigation.js
	app/modules/examples/examples.js
chore: navigation now with check for user roles and resources
fix: lint errors
chore: update devDependencies
fix: bower.json fontwaesome
Merge branch 'master_gitlab'
chore: add folder docs to bower ignore