Merge pull request #7 from raskasa/master

grabbing dan's updates
added change password functionality
added change password functionality
added insert user to MangoMapper and MangoDAO class
added navigation functionality and updated decorator and css
Merge branch 'deloff-dev' into kopra-dev
add functionality for different user privileges. added sql statements for new table in DB
Added change user privilege functionality
added change password and privilege level for admin and user
Merge branch 'deloff-dev' into kopra-dev

Conflicts:
	.idea/artifacts/GreenhouseGraphing_war_exploded.xml
	GreenhouseGraphing/WebContent/pages/index.jsp
	GreenhouseGraphing/src/actions/LoginAction.java
added change password and privilege level for admin and user
updated change privilege level
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
Merge pull request #9 from raskasa/crmaykish

Crmaykish
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
Initial implementation of Report Template creation front-end complete.