Modified classpath, changed app name, added internet permission and portrait mode
Merge conflicts
Removed static width/height variables