flash messages fixed
Merge branch 'no-disclaimer'
disclaimer removed
disclaimer helper removed
trade controller changes