updated npm/bower libraries
Merge branch 'devel' of github.com:globaleaks/GLClient into devel

Conflicts:
	bower.json
heh
Merge branch 'devel' of github.com:globaleaks/GLClient into devel
Merge branch 'devel' of github.com:globaleaks/GLClient into devel