Tom removed hockeyapp id stuff
fixed merge conflict