this is a test.
Merge branch 'master' of github.com:csantala/synopses

Conflicts:
	application/controllers/projects.php