lot of changes
Merge branch 'master' of https://github.com/satnambajwa85/gudaak

Conflicts:
	protected/components/views/widgetDashboardMenu.php
	protected/controllers/UserController.php
	protected/runtime/application.log
	themes/app/font-awesome/css/font-awesome.css
	themes/app/font-awesome/font/fontawesome-webfont.svg
	themes/app/font-awesome/font/fontawesome-webfontd41d.eot
	themes/app/font-awesome/font/fontawesome-webfontf77b.eot
	themes/app/font-awesome/font/fontawesome-webfontf77b.ttf
	themes/app/font-awesome/font/fontawesome-webfontf77b.woff
	themes/app/views/user/career.php
	themes/template/css/bootstrap.css
	themes/template/css/fonts.css
	themes/template/font-awesome/css/font-awesome.css
	themes/template/font-awesome/font/fontawesome-webfont.svg
	themes/template/font-awesome/font/fontawesome-webfontd41d.eot
	themes/template/font-awesome/font/fontawesome-webfontf77b.eot
	themes/template/font-awesome/font/fontawesome-webfontf77b.ttf
	themes/template/font-awesome/font/fontawesome-webfontf77b.woff
	themes/template/fonts/fontawesome-webfont.svg
	themes/template/fonts/fontawesome-webfontd41d.eot
	themes/template/fonts/fontawesome-webfontf77b.eot
	themes/template/fonts/fontawesome-webfontf77b.ttf
	themes/template/fonts/fontawesome-webfontf77b.woff
	themes/template/js/custom.js
	themes/template/js/dashboard-custom.js
	themes/template/views/user/editProfile.php
	themes/template/views/user/stream.php
	themes/template/views/user/stream1.php