Merge pull request #1 from doyouco/dev

Integration of the administration part
Delete main.php
Update of the .gitignore file
Merge branch 'master' of github.com:doyouco/website
Conflict resolution
Conflict resolution
Enhancement of the user's admin page integration
Merge branch 'master' into dev