Reindex repository | corrupted :(
cleaning...
Merge remote-tracking branch 'github/master'

Conflicts:
	app/admin/application.php
	app/admin/post_types/contests/register.php
	app/admin/post_types/employments/register.php
	app/admin/post_types/volunteerings/register.php
	app/assets/css/master.less
	app/config/controllers.config.php
	app/config/models.config.php
	app/controllers/BaseController.php
	app/controllers/ContestsController.php
	app/controllers/HomeController.php
	app/routes.php
	app/views/pages/home.scout.php
	app/views/partials/footer.scout.php
	app/views/post_types/contests/archive.scout.php
	app/views/post_types/contests/single.scout.php