Added admin functions
Merge branch 'master' of https://github.com/JonathanThunberg/Dat076

Conflicts:
	Mathem/faces-config.NavData
	Mathem/src/main/java/se/chalmers/dat076/mathem/model/Shop.java
	Mathem/src/main/webapp/products.xhtml