First
Merge branch 'master' of https://github.com/Interreto/mvc-wordpress

Conflicts:
	.gitignore