removed ETRI specifc changes
Merge branch 'release/1.2.1'
Merge tag '1.2.1' into develop

Release 1.2.1

Notes:
 1. Fixed oozie database from Derby to postgres
 2. Add an option in the json templates to limit master's memory usage by SGE
 3. Changed BWA Workflow version to 2.6.0
 4. Changed Seqware version to 1.0.15
Merge branch 'develop' into feature/bindle2

Conflicts:
	templates/server_setup_scripts/pancancer/ubuntu_12.04_pancancer_script.sh
	templates/server_setup_scripts/ubuntu_12.04_master_script.sh