bug fix: #1656
allow for Image on Gallery list display options
allow for image only on Gallery
bug fix: #1591 / gravatar url
Merge pull request #1701 from stevewithington/develop

bug fix: #1656
Merge branch 'develop' of git://github.com/blueriver/MuraCMS into develop
ORM Datasource Setting

I have a case where I'd like to add a different datasource for a plugin's ORM transactions. I'd tried to set it up in the plugin but this is the only way I could get it to work. Would love to see this in the main codeline.
Merge pull request #1704 from cameroncf/patch-7

ORM Datasource Setting
UserBean addAddress() Fix

The setAllValues() on the user save nukes the newAddresses value and the cfif statement never evaluates to true. A test case for this bug would be something along the lines of:

user = $.getBean( "User" ).loadBy( userId = 'some-user-id' );
address = $.getBean("addressBean");
address.setAddress1( 'Hello World Ave' );
user.addAddress(address);
user.save(); // The address doesn't get saved here

This change just temporarily saves the address values so they can exist after the user save. I also added in some error checking so the addresses don't save if the user object failed to save.
bug fix: issue #1581
Merge branch 'develop' of git://github.com/blueriver/MuraCMS into develop
Merge pull request #1707 from stevewithington/develop

bug fix: issue #1581
Merge pull request #1706 from cameroncf/patch-8

UserBean addAddress() Fix
Fixed CSS Typo

Quest for code perfection...
Merge pull request #1710 from cameroncf/patch-9

Fixed CSS Typo
Typo ine error message
Merge pull request #1711 from gowestweb/patch-5

Typo ine error message
Fixing some var scoping issues
Adding java enabled setting
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop