Merge branch 'bytime_plus' of https://github.com/sanchojaf/rails_admin into bytime_plus

Conflicts:
	app/views/rails_admin/main/index.html.haml
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch bytime_plus
# Your branch and 'origin/bytime_plus' have diverged,
# and have 1 and 2 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   app/controllers/rails_admin/main_controller.rb
#	modified:   app/views/rails_admin/main/index.html.haml
#
Merge branch 'bytime_plus' of https://github.com/sanchojaf/rails_admin into bytime_plus

Conflicts:
	app/views/rails_admin/main/index.html.haml