Navigation, my page
Merge branch 'Dev' of https://github.com/DanielAndersson92/BookShop into Dev

Conflicts:
	BookExchange_Skel/src/main/webapp/WEB-INF/faces-config.xml
	BookExchange_Skel/src/main/webapp/index.xhtml
	BookExchange_Skel/src/main/webapp/jsf/Search/search.xhtml
	BookExchange_Skel/src/main/webapp/resources/css/layout.css
	BookExchange_Skel/src/main/webapp/resources/css/style.css
	BookExchange_Skel/target/BookExchange_Skel-1.0-SNAPSHOT.war
	BookExchange_Skel/target/BookExchange_Skel-1.0-SNAPSHOT/WEB-INF/faces-config.xml
	BookExchange_Skel/target/BookExchange_Skel-1.0-SNAPSHOT/index.xhtml
	BookExchange_Skel/target/BookExchange_Skel-1.0-SNAPSHOT/jsf/Search/search.xhtml
	BookExchange_Skel/target/BookExchange_Skel-1.0-SNAPSHOT/resources/css/layout.css
	BookExchange_Skel/target/BookExchange_Skel-1.0-SNAPSHOT/resources/css/style.css
	BookExchange_Skel/target/maven-archiver/pom.properties