removing old unused files - working ones are in aws branch
Merge branch 'master' into aws

Conflicts:
	AWS/.classpath
	AWS/.project
	AWS/.settings/org.eclipse.jdt.core.prefs
	AWS/.settings/org.eclipse.wst.common.component
	AWS/.settings/org.eclipse.wst.common.project.facet.core.xml
	AWS/app/css/ui-lightness/images/animated-overlay.gif
	AWS/app/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
	AWS/app/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
	AWS/app/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
	AWS/app/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
	AWS/app/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
	AWS/app/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
	AWS/app/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
	AWS/app/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
	AWS/app/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
	AWS/app/css/ui-lightness/images/ui-icons_222222_256x240.png
	AWS/app/css/ui-lightness/images/ui-icons_228ef1_256x240.png
	AWS/app/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
	AWS/app/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
	AWS/app/css/ui-lightness/images/ui-icons_ffffff_256x240.png
	AWS/app/css/ui-lightness/jquery-ui-1.10.3.custom.css
	AWS/app/css/ui-lightness/jquery-ui-1.10.3.custom.min.css
	AWS/app/lib/jquery/jquery-ui.js
	AWS/app/lib/jquery/jquery.gridster.js
	AWS/app/lib/jquery/jquery.js
	AWS/app/lib/swfobject.js
	AWS/lib/SoyToJsSrcCompiler.jar