fix git
Merge branch 'master' of https://github.com/yabrol/LivApp

Conflicts:
	gen/com/example/livapp/R.java
	res/values/strings.xml