merge fix
merge fix
merge fixes
merge fix
-Minor updates

-Uncomment auto-redirect to dashboard when user already logged in
-add BASE_URL to layout for javascript usage
-update gitignore file
Merge branch 'development'