Merge branch 'master' into eugenia/asterix_beta_examples

Conflicts:
	asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java