add trade to portfolio
Merge remote-tracking branch 'origin/master'

Conflicts:
	cheese-grailsPlugins.iml
	cheese.iml
	grails-app/conf/BuildConfig.groovy
	grails-app/conf/Config.groovy
	grails-app/jobs/dtmc/StrategiesJob.groovy