remove depricated call to current_user in index_controller
readd
Merge branch 'split_off_templates'