before pull
Merge remote-tracking branch 'origin/master'
UI fixes
Merge remote-tracking branch 'origin/master'
Starting timer fixes (HPLocationViewController)