Start to new boilerplate
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/ie.css
	css/template.css
Start to new boilerplate