Creating template
Merge ssh://gpstracker-insonifi.rhcloud.com/~/git/gpstracker

Conflicts:
	index.html
	package.json
remove merge leftovers