Merge branch 'master' of /Users/Ahtsan/Desktop/Tap-in with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/org/aieseclchku/im/tap_in/EventDetailsFragment.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
from tsan 2014-12-2_1305 - register fragment will search 1 second after user type