Added android plugin
Merge branch 'master' of github.com:BrianBal/tm
updated android plugin
changed some project defaults
merge
updated build system to fix some bugs