Change Icon
Merge branch 'developVersion' into publishVersion

Conflicts:
	gen/com/hrw/remotecontroller/R.java
	res/drawable/rcicon.png