updated navigation menu for admin
added change password functionality
added change password functionality
update login and main page
added account settings jsp
Merge remote-tracking branch 'origin/master' into kopra-dev

Conflicts:
	GreenhouseGraphing/WebContent/decorators/decorator.jsp
	GreenhouseGraphing/WebContent/pages/index.jsp
merged with master
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.
Merge remote-tracking branch 'origin/master' into crmaykish

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