Removing Resources plugin for #15
Removing printlns
Removing erroneous output from admin menu
Merge remote-tracking branch 'origin/master'

Conflicts:
	application.properties