local initial
local initial 2
Merge branch 'master' of https://github.com/tdevinda/elais

Conflicts:
	AndroidManifest.xml
	res/values-v11/styles.xml
	res/values-v14/styles.xml
	res/values/strings.xml
	res/values/styles.xml
db changes