Changes from today
Merge branch 'master' of https://github.com/keyaral/SwenProject.git

Conflicts:
	KPSmart/file.xml
Merge branch 'master' of https://github.com/keyaral/SwenProject.git
Pullled in all code - still crashing