Pacote de contatos.
Merge branch 'master' of
https://github.com/EpilepsyProject/EpilepsyApp.git

Conflicts:
	res/drawable-hdpi/checkbox.jpg
	res/drawable-hdpi/config.jpg
	res/drawable-hdpi/splash_tela.jpg
	res/layout/activity_alertas.xml
	res/layout/activity_contatos.xml
	res/layout/activity_main2.xml
	res/menu/alertas.xml
	res/menu/contatos.xml
	src/br/com/wcabralti/contatos/ContatosUtil.java
	src/br/com/wcabralti/contatos/classes/Contato.java
	src/br/com/wcabralti/contatos/classes/Email.java
	src/br/com/wcabralti/contatos/classes/Endereco.java
	src/br/com/wcabralti/contatos/classes/IM.java
	src/br/com/wcabralti/contatos/classes/Organizacao.java
	src/br/com/wcabralti/contatos/classes/Telefone.java
	src/com/promobile/epilepticdetector/AlertasActivity.java
	src/com/promobile/epilepticdetector/Contatos.java
	src/com/promobile/epilepticdetector/ContatosActivity.java
TESTE
TESTE
Merge branch 'master' of
https://github.com/EpilepsyProject/EpilepsyApp.git