run be rake fe_engine:install:migrations

comment out migrations that we already have tables for in sp
I just want to be able to run fe_engine:install:migrations again and not
have it copy them over since the files exist
add migration from fe_engine to add conditional_id

update qe ref
update gems
Merge branch 'master' of github.com:CruGlobal/sp

Conflicts:
	Gemfile.lock
updat ecache
update fe ref