Network
Merge branch 'master' of https://github.com/simnalamburt/adoctor

Conflicts:
	Client/src/com/adoctor/adoctor/MainActivity.java
	Client/src/com/adoctor/adoctor/ScreenStateReceiver.java