telas de login e register
Merge remote-tracking branch 'origin/b'

Conflicts:
	Aplicativo/AndroidManifest.xml
	Aplicativo/res/values/strings.xml
	Aplicativo/src/com/wikifish/DialogHelp.java
	Aplicativo/src/com/wikifish/entity/Comment.java
	Aplicativo/src/com/wikifish/enums/AquariumLighting.java
	Aplicativo/src/com/wikifish/enums/AquariumSetUp.java
	Aplicativo/src/com/wikifish/enums/FeedingHabit.java
	Aplicativo/src/com/wikifish/enums/Reproduction.java
	Aplicativo/src/com/wikifish/enums/SwimmingHabits.java
	Aplicativo/src/com/wikifish/enums/Temperament.java
	Aplicativo/src/com/wikifish/image/ImageDownloader.java
	Aplicativo/src/com/wikifish/image/ImageHandlingTask.java
	Aplicativo/src/com/wikifish/listadapter/HelpListAdapter.java
	Aplicativo/src/com/wikifish/network/HttpClientConnection.java
	Aplicativo/src/com/wikifish/persistence/cache/CacheUtil.java
Fix missing string