change
Merge branch 'master' of github.com:alexmmota/iconnect

Conflicts:
	gen/br/com/socialcoreo/R.java
message