2013-10-07

Alexandra L, Daniel A, Daniel R, Patrik I
Revert "2013-10-07"

This reverts commit 9e4d1a6e612203145f9a2c2c67cd983bda0a152b.
20131007

Alexandra, Daniel A, Daniel R, Patrik
Search + misc

Börjat på Search men har också kollat lite på "WEB-INF"-filerna.
ModelFactory

Lade till BookExchangeFactory
Lekt lite med CSS.

Fungerande hemsida. Man kan få upp index.xhtml och klicka på HOME/SEARCH
och komma till respektive sida.
Bara search-funktionen kvar på search-sidan.
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
Mergefix mellan mig och Daniel

Blev lite problem eftersom vi hade ändra lite i samma filer.
Seearchfunktionen funkar
Nu funkar searchfunktionen ännu mer.
Start of mypage
footer, template in about and forum
search improvements
CSS
bookmenu layout
re: bookmenu layout

Den andra verkar inte ha bitit
Revert "re: bookmenu layout"

This reverts commit b0c27c3e09a4ca2bea8b96a7b6e4cd0666727cf4.
Start table, background, Date in book objects