Updated changes + Added /blog
Merge branch 'master' of https://github.com/vim-bogota2/ix

Conflicts:
	nbproject/private/private.xml
	themes/blue/views/layouts/main.php