Added ftp feature tests
Added monologue admin tests
Merge branch 'develop'
Merge branch 'feature/layout' into develop
Merge branch 'release/0.3'
Merge branch 'feature/tests' into develop

Conflicts:
	spec/features/ftp_spec.rb
Merge branch 'feature/layout' into develop
Merge branch 'release/0.4'
Merge branch 'feature/layout' into develop
Merge branch 'release/0.5'
Merge branch 'feature/layout' into develop
Merge branch 'release/0.6'
trying to change gemfile
Merge branch 'master' into develop
Merge branch 'develop' into feature/layout