Merge branch 'develop'

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5690 50f7a5e4-a141-4b55-9860-49daa24b3293
Merge branch 'master' of github.com:blueriver/MuraCMS

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5691 50f7a5e4-a141-4b55-9860-49daa24b3293
Merge branch 'master' of github.com:blueriver/MuraCMS

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5692 50f7a5e4-a141-4b55-9860-49daa24b3293
Merge branch 'master' of github.com:blueriver/MuraCMS

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5693 50f7a5e4-a141-4b55-9860-49daa24b3293
Merge branch 'master' of github.com:blueriver/MuraCMS

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5694 50f7a5e4-a141-4b55-9860-49daa24b3293
Merge branch 'master' of github.com:blueriver/MuraCMS

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5695 50f7a5e4-a141-4b55-9860-49daa24b3293
Merge branch 'master' of github.com:blueriver/MuraCMS

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5696 50f7a5e4-a141-4b55-9860-49daa24b3293
Merge branch 'master' of github.com:blueriver/MuraCMS

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5697 50f7a5e4-a141-4b55-9860-49daa24b3293
Merge branch 'master' of github.com:blueriver/MuraCMS

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5698 50f7a5e4-a141-4b55-9860-49daa24b3293
Merge branch 'master' of github.com:blueriver/MuraCMS

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5699 50f7a5e4-a141-4b55-9860-49daa24b3293
Merge branch 'master' of github.com:blueriver/MuraCMS

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5700 50f7a5e4-a141-4b55-9860-49daa24b3293
Merge branch 'master' of github.com:blueriver/MuraCMS

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5701 50f7a5e4-a141-4b55-9860-49daa24b3293
Merge branch 'master' of github.com:blueriver/MuraCMS

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5702 50f7a5e4-a141-4b55-9860-49daa24b3293
Merge branch 'master' of github.com:blueriver/MuraCMS

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5703 50f7a5e4-a141-4b55-9860-49daa24b3293
Merge branch 'master' of github.com:blueriver/MuraCMS

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5704 50f7a5e4-a141-4b55-9860-49daa24b3293
Adding logic to add missing lock when mura starts in admin
Merge branch 'master' of github.com:blueriver/MuraCMS
Merge branch 'develop'
Merge branch 'master' of github.com:blueriver/MuraCMS

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5696 50f7a5e4-a141-4b55-9860-49daa24b3293
Merge branch 'master' of github.com:blueriver/MuraCMS

git-svn-id: http://svn.blueriver.com/mura/trunk/www@5697 50f7a5e4-a141-4b55-9860-49daa24b3293