rearranged code to all standard. optimized imports and updated to lollipop compile
Merge branch 'master' of github.com:agrosner/DBFlow