Added in changes to the project settings.
Merge branch 'master' of https://github.com/cadyyan/MCManager-Mobile

Conflicts:
	.classpath
Merge branch 'master' of https://github.com/cadyyan/MCManager-Mobile
Fixed issues with the passing of variables between activities.
Merge branch 'master' of https://github.com/cadyyan/MCManager-Mobile
Fixed the issues with the async task.  Also added a helper to help with the converting time and memory  Also Renamed Player_Adapter.java to PlayerAdapter.java.
Merge branch 'master' of https://github.com/cadyyan/MCManager-Mobile