Merge branch 'master' of riemann.math.mun.ca:/users/cs/faculty/fiech/COMP4770-winter2014/SC_Sim_6 into release

Conflicts:
	.gitignore
Merge branch 'master' of riemann.math.mun.ca:/users/cs/faculty/fiech/COMP4770-winter2014/SC_Sim_6 into release
Merge branch 'release' into develop