Partial Commit

Database work started. Edit Team Menu started
Merge remote-tracking branch 'origin/master'

Conflicts:
	StaTapAlpha/res/values/strings.xml