update gradle + ApiConstants
Android Studio 1.0 fixes, add icons, layout refinement
fix conflict