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