j
Merge branch 'master' of http://github.com/iomekam/GTSafe
commited
Merge branch 'master' of http://github.com/iomekam/GTSafe

Conflicts:
	GTSafe/bin/classes/com/example/gtsafe/CleryActActivity.class