Update database / Add shop / Picture Manager
Merge branch 'master' of https://github.com/nrigaudiere/MusicaLocaliser

Conflicts:
	.gitignore
	.htaccess
	.project
	application/config/autoload.php
	application/config/config.php
	application/config/database.php
	application/controllers/add.php
	application/controllers/home.php
	application/controllers/search.php
	application/models/dataaccess.php
	application/views/add_view.php
	application/views/footer_view.php
	application/views/header_view.php
	application/views/home_view.php
	application/views/search_view.php
	assets/css/design.css