Merge branch 'master' of /Users/Ahtsan/Desktop/Tap-in with conflicts.
from tsan 2014-12-28_1148 - solve the nullpointer exception in Register Fragment