Double post, updated Version Number
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/master' into development