Merge branch 'master' of https://github.com/RickMethot/StockSynthesis_3.3

Conflicts:
	SS3trial.tpl
Merge branch 'master' of https://github.com/RickMethot/StockSynthesis_3.3

Conflicts:
	SS3trial.tpl