converted to gradle
removed the support library - should come from the main project
structure change to fit the AS new /src folder structure
Merge branch 'tmp'

Conflicts:
	libs/android-support-v4.jar