remove feature
Merge branch 'master' of https://github.com/man-r/SportCalendar

Conflicts:
	client/platforms/android/CordovaLib/ant-build/build.prop
	client/platforms/android/CordovaLib/ant-build/classes.jar
	client/platforms/android/ant-build/SportCalendar-debug-unaligned.apk
	client/platforms/android/ant-build/SportCalendar-debug.apk
	client/platforms/android/ant-build/SportCalendar.ap_
	client/platforms/android/ant-build/build.prop
	client/platforms/android/ant-build/dexedLibs/classes-9a2f44b4b6d4d838aabd191db1cab362.jar
	client/platforms/android/assets/www/controllers/main.js
	client/platforms/android/assets/www/views/main.htm
	client/www/controllers/main.js
	client/www/views/main.htm