Merge branch 'develop' of https://github.com/WillyMareka/southern_cross

Conflicts:
	application/modules/applications/views/diploma_form.php
	dbv/data/meta/revision
no message
if buffet is pronounced buffe,why is bullet not pronounced bulle?

Signed-off-by: Richard Karsan <karsanrichard@gmail.com>
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop

Conflicts:
	application/modules/applications/views/diploma_form.php
	application/modules/users/controllers/users.php
	dbv/data/meta/revision