Animation with Greensock
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/education.html
	app/views/hardmetal-personality.html
	app/views/hardwood-personality.html
	app/views/motherearth-personality.html
	app/views/mountainearth-personality.html
	app/views/personal-consultations.html
	app/views/qi-energy.html
	app/views/schedule-consultations.html
	app/views/secrets-fengshui.html
	app/views/softmetal-personality.html
	app/views/softwood-personality.html
	app/views/water-personality.html
	app/views/wu-xing-elements.html
	app/views/yin-yang.html
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'