commit
Merge branch 'master' of https://github.com/tgioihan/PlayOTA

Conflicts:
	src/com/appota/playota/database/DatabaseHelper.java