Merge
Merge branch 'master' of https://github.com/ScottsTots/TraceMe

Conflicts:
	TraceMe/TraceMe.iml
Merge branch 'master' of https://github.com/ScottsTots/TraceMe
Custom Actionbar