Committing everything from the mercurial repository because I'm being silly.
Went a little crazy
Merge branch 'master' of https://github.com/lanacademy/monstra-cms

Conflicts:
	.htaccess
	backups/.empty
	backups/.htaccess
	changelog.txt
	plugins/box/backup/backup.admin.php
	plugins/box/backup/views/backend/index.view.php
	plugins/box/blocks/blocks.admin.php
	plugins/box/blocks/views/backend/index.view.php
	plugins/box/filesmanager/filesmanager.admin.php
	plugins/box/filesmanager/views/backend/index.view.php
	plugins/box/pages/pages.admin.php
	plugins/box/pages/views/backend/index.view.php
	plugins/box/plugins/plugins.admin.php
	plugins/box/plugins/views/backend/index.view.php
	plugins/box/snippets/snippets.admin.php
	plugins/box/snippets/views/backend/index.view.php
	plugins/box/system/system.admin.php
	plugins/box/system/views/backend/index.view.php
	plugins/box/themes/themes.admin.php
	plugins/box/themes/views/backend/index.view.php
	plugins/box/users/users.admin.php
	plugins/box/users/views/backend/index.view.php
	public/assets/css/bootstrap-lightbox.css
	public/assets/css/bootstrap-responsive.css
	public/assets/css/bootstrap.css
	public/assets/img/flags/de.png
	public/assets/img/flags/en.png
	public/assets/img/flags/es.png
	public/assets/img/flags/fa.png
	public/assets/img/flags/fr.png
	public/assets/img/flags/hu.png
	public/assets/img/flags/it.png
	public/assets/img/flags/lt.png
	public/assets/img/flags/pt-br.png
	public/assets/img/flags/ru.png
	public/assets/img/flags/sk.png
	public/assets/img/flags/sr-yu.png
	public/assets/img/flags/uk.png
	public/assets/img/glyphicons-halflings-white.png
	public/assets/img/glyphicons-halflings.png
	public/assets/img/monstra-logo.png
	public/assets/js/bootstrap-lightbox.js
	public/assets/js/bootstrap.js
	public/assets/js/jquery.js
	public/themes/default/css/default.css
	public/themes/default/footer-links.chunk.php
	public/themes/default/footer.chunk.php
	public/themes/default/header.chunk.php
	public/themes/default/index.template.php
	public/uploads/.empty
	sitemap.xml
	storage/.htaccess
	storage/blocks/.empty
	storage/database/menu.table.xml
	storage/database/options.table.xml
	storage/database/pages.table.xml
	storage/database/plugins.table.xml
	storage/database/users.table.xml
	storage/pages/1.page.txt
	storage/pages/2.page.txt
	storage/snippets/google-analytics.snippet.php
	tmp/.htaccess
	tmp/cache/.empty
	tmp/logs/.empty
	tmp/minify/.empty
	tmp/minify/.htaccess