Rebuilt project to merge Android and logic
Fixed issue with auto-genered R
Removed files that should not be commited to VCS
Change skipTests to false in travis build
Bound Android goals to common Maven lifecycle goals