Initial commit
BIUCLOUD-165: Initial commit of express-admin
BIUCLOUD-136: Merge conflicts
BIUCLOUD-165: Primary functionality complete.
BIUCLOUD-165: Removing unneeded files.
BIUCLOUD-165: Bug fixes, configurations.
BIUCLOUD-165: Remove 'test' folder
Merge pull request #1 from rifflock/master

Initial commits
BIUCLOUD-165: Change port.
Merge pull request #2 from rifflock/master

BIUCLOUD-165: Change port.
No Jira, expanded settings for new table.
Stop tracking settings files
Merge branch 'master' of github.com:rifflock/express-admin into merge-branch

Conflicts:
	.gitignore
	.travis.yml
	LICENSE
	Makefile
	README.md
	app.js
	bin/admin
	config/lang/bg.json
	config/lang/en.json
	config/libs.json
	config/themes.json
	lib/core/database.js
	lib/core/editview.js
	lib/core/listview.js
	lib/utils/database.js
	lib/utils/error.js
	lib/utils/pagination.js
	lib/utils/program.js
	lib/utils/project.js
	lib/utils/query.js
	lib/utils/routes.js
	lib/utils/schema.js
	lib/utils/settings.js
	lib/utils/sql.js
	lib/utils/template.js
	lib/utils/user.js
	lib/utils/validate.js
	package.json
	public/express-admin.css
	public/express-admin.js
	public/favicon.ico
	routes/404.js
	routes/auth.js
	routes/editview.js
	routes/index.js
	routes/listview.js
	routes/login.js
	routes/mainview.js
	routes/render.js
	views/404.html
	views/base.html
	views/breadcrumbs.html
	views/editview.html
	views/editview/column.html
	views/editview/manyToOne.html
	views/editview/oneToOne.html
	views/editview/view.html
	views/header.html
	views/js/layout.html
	views/js/theme.html
	views/listview.html
	views/login.html
	views/mainview.html
	views/pagination.html
Merge pull request #1 from rifflock/merge-branch

Merge in changes to new fork