Added pageAdmin class to be able to change page content
Merge branch 'master' of github.com:protalk/protalk
Add Buzz and SensioBuzzBundle entries to deps file
Add Buzz and SensioBuzzBundle entries to autoload file
Enable SensioBuzzBundle in AppKernel file
Fix css errors
-Add controller, template and css styling to display list of contributors on About page
Remove unnecessary white space and commented code, add docbloc comment to getContributorsAction
Added contribution admin class
Minor text change
Added Feed and Feedtype tables including admin screens
Merge branch 'master' of github.com:protalk/protalk

Conflicts:
	app/config/config.yml
	src/Protalk/AdminBundle/Admin/PageAdmin.php
Added target _blank to all links in the footer and re-ordered the icons a bit
Removed create button for contribution admin class
Removed acmedemo assets which aren't used
Merge branch 'master' of github.com:protalk/protalk

Conflicts:
	app/config/parameters.ini
Fixed a form changes due to Sf2.1 update: attr -> label_attr for labels
Added few items to the ignore list
Merge branch 'master' of https://github.com/protalk/protalk into gitignore
Merge branch 'master' of github.com:protalk/protalk