Integration of master into track2 branch  due to Storyboard conflicts that cannot be resolved manually / Add signup function