skeleton
Merge branch 'master' of https://github.com/etconsilium/demo-tr

Conflicts:
	bower.json