Merge branch 'master' into Users

Conflicts:
bin/classes/com/example/prugit/MainActivity$PlaceholderFragment.class
bin/classes/com/example/prugit/MainActivity.class
src/com/example/prugit/MainActivity.java