0.3.5 nightly
Merge branch 'master' of https://github.com/ctomni231/cwtactics

Conflicts:
	srcEngine/model/weather.js
0.3.5 nightly