Added main app
Fixed R.java errors