wip
Merge branch 'master' of github.com:edarta/cryptx-avalon

Conflicts:
	Overview.mm