Errors resolved. Warnings to be investigated.
Merge branch 'master' of
https://github.com/SmartTrolley/SmartTrolleyMainCode.git

Conflicts:
	SmartTrolley/.classpath