fensite-16 Create a Gulp Task for Angular value, animation (3 types)
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/home.js
	app/styles/fen-elements.css
	package.json
Merge remote-tracking branch 'origin/master'
fensite-16 Create a Gulp Task for Angular value, animation (3 types)
Merge remote-tracking branch 'origin/master'