Acrescentando componentes no menu
Merge branch 'master' of https://github.com/danielcalencar/pubshare
reaolving conflicts
Conflicts:
	res/values/strings.xml
Merge pull request #31 from danielalencar/master

correcting gen/.gitignore
Merge pull request #30 from judf/master

Add some components in menu activity.
removing R
Merge http://github.com/danielcalencar/pubshare

Conflicts:
	gen/br/ufrn/dimap/pubshare/activity/R.java