[dev] sourcetree testing the app
Merge branch 'dev' into new-branch-20140207