changed power supply call to static
Merge branch 'master' of github.com:jetav8r/android-source
this is a mess
Merge remote-tracking branch 'origin/master'

Conflicts:
	milestone_01_java/02_nuance/threads/src/com/bloc/threads/ImageGetter.java
	milestone_01_java/02_nuance/threads/src/com/bloc/threads/Main.java
added 2 drawers