Fixed pesky bug relating to R.java
Updated Service/Activity definitions