Setup IntelliJ as an IDE.
Merge branch 'master' into kasa-dev

Conflicts:
	GreenhouseGraphing/WebContent/decorators/decorator.jsp
	GreenhouseGraphing/build/classes/struts.xml
	GreenhouseGraphing/src/actions/LoginAction.java
import from correct package
Created models to support the Report Template Creation module.
Creating test classes in preparation for implementing unit tests once models are implemented.
Merge branch 'master' into kasa-dev

Conflicts:
	GreenhouseGraphing/WebContent/decorators/decorator.jsp
	GreenhouseGraphing/src/actions/LoginAction.java
Merged commits from master
Oops, forgot a few things.
Merge branch 'master' into kasa-dev

Conflicts:
	.idea/artifacts/GreenhouseGraphing_war_exploded.xml
	GreenhouseGraphing/WebContent/decorators/decorator.jsp
Need to use correct data structures.
Boilerplate code for creating and editing report templates.
Beginning to implemented report template creation business logic.
Removing folder from version control
Creating the view for report template creation; need to fix issue with close button on chart configuration DIV
Merge pull request #9 from raskasa/crmaykish

Crmaykish
More implementation code in preparation for merge with Colin's sensor implementation.
Merge remote-tracking branch 'origin/kasa-dev' into crmaykish

Conflicts:
	GreenhouseGraphing/WebContent/decorators/decorator.jsp
	GreenhouseGraphing/build/classes/struts.xml
	GreenhouseGraphing/src/actions/LoginAction.java
	GreenhouseGraphing/src/models/Sensor.java
	GreenhouseGraphing/src/struts.xml