sincronizacao de telas
Merge branch 'master' of https://github.com/Fredyelmer/studia

Conflicts:
	Sttudia/Controller/BoardViewController.h
Merge branch 'master' of https://github.com/Fredyelmer/studia
updated merge