Weather API change
Merge branch 'master' of https://github.com/ubc-magic-students/enph479-2013

Conflicts:
	algorithm-module/src/main/java/ca/ubc/magic/enph479/WoTDataFetcher.java