Try to force ami-2012.03
Merge branch 'release-1.21c' into develop
Attempt to move to 2014.03 ami.
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Stack-Builder into develop
Use custom AMI
Merge pull request #99 from xschildw/release-1.21c-custom-ami

Use custom AMI
Merge branch 'release-1.21c' into develop

Conflicts:
	src/main/resources/elastic-beanstalk-config.properties
These changes should have been on branch
Remove bridge from SSLSetup
Merge pull request #100 from xschildw/remove-java7-env

Merge and sync develop branch