animation, controlller button ready version
Merge branch 'master' of https://github.com/Macroon70/onLive_PoC_v3

Conflicts:
	site.js