stable commit
stable branch
Merge branch 'master' of github.com:agiza/application

Conflicts:
	profiles/octopus_video/libraries/nivo-slider/jquery.nivo.slider.js
	profiles/octopus_video/modules/contrib/views_field_view/LICENSE.txt
	profiles/octopus_video/modules/contrib/views_field_view/README.txt
	profiles/octopus_video/modules/contrib/views_field_view/views_field_view.css
	profiles/octopus_video/modules/contrib/views_field_view/views_field_view.info
	profiles/octopus_video/modules/contrib/views_field_view/views_field_view.views.inc
	profiles/octopus_video/modules/contrib/views_field_view/views_field_view_handler_field_view.inc