Merging
Merge branch 'master' of
https://github.com/nlubczynski/DesignProject.git

Conflicts:
	DesignProject/bin/DesignProject.apk
	DesignProject/bin/classes.dex
	DesignProject/bin/resources.ap_
Added Global object of current "location"