JS moved to main.js
Main.js included in bottom of proto-1, proto-2 and standard message
Merge branch 'develop' of https://github.com/martinemil/Context-Aware-Mobile-Messaging into develop

Conflicts:
	message_proto-1.html