perubahan pada database
perbaikan kesalahan
Merge branch 'master' of https://github.com/Desilva/fracas

Conflicts:
	StarEnergi/Controllers/FrontEnd/HelpController.cs