Paul's adjustments.
Merge branch 'master' of https://github.com/parmarg/alco-trek

Conflicts:
	view/index.html