fixed some stuff with squeeze tests
fixed some things
Merge branch 'master' of github.com:dsmejkal/automation

Conflicts:
	rspec/flagship/flagship.rb