Someting something normailzation
Merge branch 'master' of https://github.com/hansgra/giftr-android

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	app/build/res/all/release/layout/activity_main.xml
	app/build/res/all/release/layout/activity_view_wishlists.xml
	app/build/res/all/release/layout/wish_list_item_adapter.xml
	app/src/main/AndroidManifest.xml
	app/src/main/java/no/whatever/testapp/CameraFragment.java
	app/src/main/java/no/whatever/testapp/WishListItemAdapter.java
	app/src/main/res/values/strings.xml
	libs/third_party_licenses.txt
	src/no/whatever/testapp/TestApplication.java
	src/no/whatever/testapp/ViewWishListItemsActivity.java
	src/no/whatever/testapp/ViewWishListsActivity.java

Still merging