MtpA - no real changes
Merge branch 'master' of https://github.com/Team-Two/LiftMe_Client.git

Conflicts:
	LiftMeClient/src/com/liftme/liftmeclient/Lifter.java
Merge branch 'master' of https://github.com/Team-Two/LiftMe_Client.git
MtpA - Comment change to check commit