update
Merge branch 'master' of https://github.com/krasi-karamazov/DoTopia

Conflicts:
	.idea/libraries/picasso_2_1_1.xml
	.idea/libraries/retrofit_1_5_0.xml
	DoTopia/src/main/java/com/augeo/dotopia/ui/fragments/LoginFragment.java