Changed properties
Merge branch 'master' of https://github.com/apps8os/trafficsense

Conflicts:
	TrafficSense_Library/project.properties