bumped version to 0.3.6
Merge branch 'develop' into citestrade
Merge branch 'develop' into citestrade
added cites_trade assets to precompile arrays
removed a wild require_tree from application.css. this could use some tidying up.
fixed some css errors that upset asset compilation
Merge branch 'develop' into citestrade
fixed css errors for compiler and added the cites_trade to config
Merge branch 'master' of github.com:unepwcmc/SAPI into citestrade

Conflicts:
	CHANGELOG.md
Merge branch 'citestrade' of github.com:unepwcmc/SAPI into citestrade

Conflicts:
	config/environments/production.rb
	config/environments/staging.rb
Merge branch 'citestrade' into develop
Merge branch 'develop' of github.com:unepwcmc/SAPI into develop