Removed drupal folders
Replaced drupal index.php with correct index.php
Merge branch '20141105-journalissues' into dev

Conflicts:
	index.php