Live templates
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/styles/fenelements.css
	app/styles/fenelements.styl
	app/styles/main.css
	app/styles/modal.css
Live templates
animation