Merge branch 'bootstrap3-migration' of https://github.com/sethbusque/offensely

Conflicts:
	protected/config/main.php
	protected/views/layouts/_navbar.php
	protected/views/user/dashboard.php