Merge branch 'daniela'

Conflicts:
bin/LifeRun.apk
bin/classes.dex
bin/classes/com/liferun/activities/InterestsActivity$1.class
bin/classes/com/liferun/activities/InterestsActivity$2.class
bin/classes/com/liferun/activities/InterestsActivity.class
bin/classes/com/liferun/activities/LoginActivity.class
bin/classes/com/liferun/activities/MapActivity.class
bin/classes/com/liferun/activities/SplashActivity$1.class
bin/classes/com/liferun/activities/SplashActivity.class
bin/classes/com/liferun/arrayadapters/InterestsArrayAdapter.class
bin/classes/com/liferun/liferun/R$drawable.class
bin/classes/com/liferun/liferun/R$id.class
bin/classes/com/liferun/liferun/R$layout.class
bin/classes/com/liferun/liferun/R$menu.class
bin/classes/com/liferun/liferun/R$string.class
bin/classes/com/liferun/liferun/R$style.class
bin/dexedLibs/android-support-v4-37469628a9582189a93930d01e64b979.jar
bin/dexedLibs/google-play-services-07edd2930e7318c5546621c70929f51e.jar

bin/dexedLibs/quickblox-android-1.1.0-48842db9010172a69b46fbd503a809d9.j
ar
bin/resources.ap_
gen/com/liferun/liferun/R.java
src/com/liferun/activities/SplashActivity.java