commit registrouser y registro restaurante
Commit clases restaurante arregladas
Manu: Probando el Merge en develop_html


Merge remote-tracking branch 'origin/develop_html' into develop_html
COmmit Inicio terminado
commit fotos acerca de y contacto
Commit de buscar1 falta rellenarlo
Merge branch 'develop_html' into develop

Conflicts:
	restaurapp-api/src/main/java/edu/upc/eetac/dsa/dsaqt1415g6/restaurapp/api/DataSourceSPA.java
	restaurapp-api/src/main/java/edu/upc/eetac/dsa/dsaqt1415g6/restaurapp/api/RestauranteResource.java
	restaurapp-api/src/main/java/edu/upc/eetac/dsa/dsaqt1415g6/restaurapp/api/model/Restaurante.java
	restaurapp-api/src/main/java/edu/upc/eetac/dsa/dsaqt1415g6/restaurapp/api/model/RestauranteCollection.java