I DON'T WANT THE BINS
Merge remote-tracking branch 'upstream/elasticSearchDev' into elasticSearchDev

Conflicts:
	cmput301t03app/bin/classes/ca/ualberta/cs/cmput301t03app/R$id.class
	cmput301t03app/bin/classes/ca/ualberta/cs/cmput301t03app/R$layout.class
	cmput301t03app/bin/classes/ca/ualberta/cs/cmput301t03app/R$menu.class
	cmput301t03app/bin/classes/ca/ualberta/cs/cmput301t03app/R$string.class
	cmput301t03app/bin/classes/ca/ualberta/cs/cmput301t03app/R$style.class
Comments are now pushed to the server
Merging new changes

Merge remote-tracking branch 'upstream/elasticSearchDev' into elasticSearchDev