Merge branch 'release/release-1-19-2014_1_5_1' into development
Ready to deploy into release branch
Ready to deploy and test out
Merge branch 'feature/integrate-docs' into development
Forgot to add Docs to View and Add Screens
Docs added
Merge branch 'release/release-1-21-2014_1_5_2'