Creating template
Merge branch 'master' of ssh://beta-livingmap.rhcloud.com/~/git/beta

Conflicts:
	README.md
	package.json
Removed files