Commiting app.java
Merge branch 'trunk' of https://github.com/napster112/joker-space.git into trunk