Merge pull request #2 from manchesterfish/local_v2

First automatic merge after conflict due to database inconsistence (solution: http://blog.michelemattioni.me/2013/01/29/what-do-i-do-when-my-pull-request-does-not-merge-automatically-in-master/ )
Merge pull request #3 from manchesterfish/local_v2

Good
logoo changed
Merge pull request #4 from manchesterfish/local_v3

Good!
Deleted some pictures
Merge pull request #5 from manchesterfish/local_v4

9.18
_form conflict resoved
recompile
Add view/pages folder to hold static pages
Security Control to Admin added
Merge branch 'master' into local_v4

Conflicts:
	app/views/layouts/application.html.erb