Updated templates
Templates updated to Bootstrap 3.0
Removed trailing space
Controller base current user
Merge pull request #209 from sagikazarmark/1.7/develop

Bootstrap 3.0 upgrade+bugfix