.
Merge branch 'Mobile' of https://github.com/dkaynarc/tmc.git into Mobile

Conflicts:
	src/mobile/TMC/src/fragments/EnvironmentFragment.java
	src/mobile/TMC/src/ictd/activities/ModuleActivity.java