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 'new_branch_name'