Merge branch 'master' into development
Simpler options for lazy-img + updat dependencies
Updated dependencies
Merge branch 'development' of https://github.com/jvdamgaard/employme.at into development

Conflicts:
bower.json
package.json
Don't load hidden background images
Merge branch 'development' of https://github.com/jvdamgaard/employme.at into development

Conflicts:
	app/scripts/util/lazy-img.js
	bower.json
	package.json
Removed conflict
Use highlight.js
Code highlight spans for header
Colors for code highlight
Optimized comments for docs
Merge branch 'development'