Merge remote-tracking branch 'origin/master'

Conflicts:
	app/code/local/Oggetto/News/Model/Resource/Section/Collection.php
	app/code/local/Oggetto/News/Model/Resource/Section/Post/Collection.php
	app/code/local/Oggetto/News/Model/Resource/Section/Tree.php
	app/code/local/Oggetto/News/controllers/Adminhtml/News/PostController.php
	app/code/local/Oggetto/News/controllers/Adminhtml/News/SectionController.php
	app/code/local/Oggetto/News/data/oggetto_news_setup/data-install-0.1.0.php
	app/code/local/Oggetto/News/sql/oggetto_news_setup/install-0.1.0.php
Merge remote-tracking branch 'origin/master'