Merge branch 'master' of https://github.com/thomasonyemechi/lentoria-frontend

# Conflicts:
#	app/Http/Controllers/helper.php