fixed alot of bug from previous push
fixed alot of bugs from previous push
....
Removed bin and gen
Merge branch 'master' into psuedo_master

Conflicts:
	src/com/innutrac/poly/innutrac/MainActivity.java