1st
Fixed endless scroll Admin page

look at line 331; does not seem like a good permanent fix.
Merge branch 'master' of https://github.com/alin72/CSE-308

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml