Austin Commit 10/22/13

Storyboard restructuring and forgot password support
Merge branch 'Austin's-Branch'