Reformatted code layout
Merge branch 'master' of github.com:sangar/ActiveAndroid