updated navigation menu for admin
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
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.