big fixes
Merge branch 'master' of https://github.com/tifa13/LBIA-mobile-app

Conflicts:
	Android/Dream/src/com/DreamInc/dream/SecondScreenActivity.java