Admin index translation progress
Merge branch 'master' of https://github.com/jackl92/SENG403-Group6

Conflicts:
	admin/index.php