correct config for online version
merging from preview
merging preview changes into online
set online URL correctly
should be building online version locally
remove duplicate flex config loading
Merge branch 'preview' into online
changed logentries feedback message
stop travis file from being merged
dont cache front end assets
merging preview
merging preview
merging prview
Merge branch 'preview' into online
merging change for heroku
typo
Merge branch 'refs/heads/dev' into online
Merge branch 'refs/heads/dev' into online

Conflicts:
	.actionScriptProperties
Merge branch 'refs/heads/dev' into online
Merge branch 'refs/heads/dev' into preview