deleted:    README
	deleted:    application/.htaccess
	deleted:    application/cache/.htaccess
deleted
Merge branch '2.0'

Conflicts:
	application/config/pictures.php
	application/models/pictures_model.php
	application/views/pictures_view.php
	index.php
	deleted:    application/config/development/config.php
Merge branch 'master' into 2.0