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.
Merge pull request #7 from raskasa/master

grabbing dan's updates
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 #8 from raskasa/kopra-dev

Kopra dev
Removing IntelliJ project files from version control.
SensorSelectAction displays a list of sensors and the submit button will
create a list of sensor IDs in the action for use the report creation.
clean up sensor select code
Merge remote-tracking branch 'origin/master' into crmaykish

Conflicts:
	GreenhouseGraphing/src/dao/MangoDAO.java
	GreenhouseGraphing/src/dao/MangoMapper.xml
	GreenhouseGraphing/src/dao/config.xml