minor changes
Merge branch 'development' of github.com:usmantahirr/Portobuild into development

Conflicts:
	application/views/album/index.php
theme2 added