video plugin and photo plugin
Merge branch 'master' of https://github.com/66beta/badboy

Conflicts:
	badboy.sql
	wp-content/plugins/bb_photo/bb_photo.js
	wp-content/plugins/bb_photo/bb_photo.php
	wp-content/plugins/bb_video/bb_video.js
	wp-content/plugins/bb_video/bb_video.php