Template renamed to blog
Blog details
bower json
Bower directory
Bower fontawesome
Merge branch 'f2_bowerconfig' into develop
Merge branch 'develop' into f1_wisten_theme

Conflicts:
	_includes/head.html
Fontawesome include correction