Merge pull request #1213 from stevewithington/develop

minor bug fix: muraProxy.cfc:login method
mura.6.1 object styles cleanup
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop