refactoring
Merge branch 'dev' of https://github.com/IstiN/android_xcore into dev