modify app properties - test commit
re-minified jqPlot JavaScript files, re-run latest `brew install yuicompressor` on a bunch of other files too
Merge branch 'master' of https://github.com/PhenotypeFoundation/GSCF
Added application.properties to .gitignore
Merge branch 'bundle_modules' of https://github.com/PhenotypeFoundation/GSCF into master-merge

Conflicts:
	application.properties
	web-app/css/default.min.css
Revert "Added application.properties to .gitignore"

This reverts commit 064c9146fbb5a8d0868032ee4be511ff419e0729.
Grails version downgrade to 2.2.2
Changed grails version back to 2.2.3
Merge branch 'bundle_modules' of github.com:PhenotypeFoundation/GSCF into bundle_modules
Update of gedimporter version
Update dbxp-base
Changed order of element in <head> of dialog template as the order before generated issues.
Fixed minor issues

- Bug concerning assigning templates to samples during edit process of
study has been fixed
- Additional columns for samples are no longer shown when no template is
assigned to the sample
Updated version of dbxp base
Hide the "Simple edit wizard" links
Fixed issue where the FileController would output the filename with unnecessary HTML markup.
dbxp-sam, dbxp-base and gdtimporter version up
Merge pull request #96 from thehyve/bundle_modules

Merge The Hyve commits to PhenotypeFoundation