Untrack R.java
Fix conflict
Merge remote-tracking branch 'develop/develop' into develop

Conflicts:
	gen/com/jinnova/smartpad/R.java
	src/com/jinnova/smartpad/android/feed/Branch.java
	src/com/jinnova/smartpad/android/feed/Store.java