Merge branch 'development' of https://github.com/apartyka/Html5-Starter-Kit-Middleman-Edition into development

Conflicts:
	.gitignore
Merge branch 'development' of https://github.com/apartyka/Html5-Starter-Kit-Middleman-Edition into development

Conflicts:
	.gitignore