changed gallery structure
fix gallery
Merge branch 'master' into gallery-fixing

Conflicts:
	softwareplanet-cms/app/models/cms/source_helper.rb
gallery commit
Merge branch 'master' into gallery-fixing

Conflicts:
	softwareplanet-cms/app/controllers/cms/source_manager_controller.rb
	softwareplanet-cms/app/models/cms/source_helper.rb
fix gallery
Merge branch 'gallery-fixing' of github.com:softwareplanet/cms into gallery-fixing
fixed upload image with existing name
default order settings added