Integration (error free)

Testing is not done yet.
Successful testing

R.java problem is solved