Bug and minor changes.
Merge branch 'origin/master'

Conflicts:
	app/less/app/basic.less
	app/views/project/view.php
changes tyo clasificate
Merge branch 'origin/master'
tabs fixed, ellipses added and minor changes