Feedback / rating implemented
R.java conflicts resolved. Wii be generated later