Merge Testing
Merge branch 'master' of https://github.com/mantazer/Synchronous

Conflicts:
	src/app/synchronous/ContactCard.java