nom
Merge branch 'master' of https://github.com/HewPenguin/develop

Conflicts:
	w/.metadata/.plugins/com.aptana.core.io/connections.1
	w/.metadata/.plugins/com.aptana.syncing.core/defaultConnection.1
	w/.metadata/.plugins/com.aptana.syncing.core/sites.1
	workspace_develop/.metadata/.log
	workspace_develop/.metadata/.plugins/com.aptana.core.io/connections.11
	workspace_develop/.metadata/.plugins/com.aptana.core.io/connections.9
	workspace_develop/.metadata/.plugins/com.aptana.syncing.core/defaultConnection.11
	workspace_develop/.metadata/.plugins/com.aptana.syncing.core/defaultConnection.9
	workspace_develop/.metadata/.plugins/com.aptana.syncing.core/sites.11
	workspace_develop/.metadata/.plugins/com.aptana.syncing.core/sites.9
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.projects/hew_dev/.markers.snap
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.projects/hew_dev/.syncinfo.snap
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.snap
	workspace_develop/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.theme.prefs
	workspace_develop/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	workspace_develop/.metadata/.plugins/org.eclipse.jdt.core/1121065476.index
	workspace_develop/.metadata/.plugins/org.eclipse.jdt.core/1525561123.index
	workspace_develop/.metadata/.plugins/org.eclipse.jdt.core/545089467.index
	workspace_develop/.metadata/.plugins/org.eclipse.jdt.core/831966124.index
	workspace_develop/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	workspace_develop/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	workspace_develop/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	workspace_develop/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	workspace_develop/.metadata/.plugins/org.eclipse.wst.jsdt.core/externalLibsTimeStamps
	workspace_develop/.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/savedIndexNames.txt
	workspace_develop/.metadata/.plugins/org.eclipse.wst.jsdt.core/variablesAndContainers.dat
	workspace_develop/.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
	workspace_develop/.metadata/.plugins/org.eclipse.wst.xml.core/system_catalog.xml