New Dir

Signed-off-by: Elliot Taylor <elliot@raison.co>
1.2.8 version

Signed-off-by: Elliot Taylor <elliot@raison.co>
Merge branch 'master' of https://github.com/raisonon/bamboo

Conflicts:
	assets/images/prettyPhoto/dark_rounded/btnNext.png
	assets/images/prettyPhoto/dark_rounded/btnPrevious.png
	assets/images/prettyPhoto/dark_rounded/contentPattern.png
	assets/images/prettyPhoto/dark_rounded/default_thumbnail.gif
	assets/images/prettyPhoto/dark_rounded/loader.gif
	assets/images/prettyPhoto/dark_rounded/sprite.png
	assets/images/prettyPhoto/dark_square/btnNext.png
	assets/images/prettyPhoto/dark_square/btnPrevious.png
	assets/images/prettyPhoto/dark_square/contentPattern.png
	assets/images/prettyPhoto/dark_square/default_thumbnail.gif
	assets/images/prettyPhoto/dark_square/loader.gif
	assets/images/prettyPhoto/dark_square/sprite.png
	assets/images/prettyPhoto/facebook/btnNext.png
	assets/images/prettyPhoto/facebook/btnPrevious.png
	assets/images/prettyPhoto/facebook/contentPatternBottom.png
	assets/images/prettyPhoto/facebook/contentPatternLeft.png
	assets/images/prettyPhoto/facebook/contentPatternRight.png
	assets/images/prettyPhoto/facebook/contentPatternTop.png
	assets/images/prettyPhoto/facebook/default_thumbnail.gif
	assets/images/prettyPhoto/facebook/loader.gif
	assets/images/prettyPhoto/facebook/sprite.png
	assets/images/prettyPhoto/light_rounded/btnNext.png
	assets/images/prettyPhoto/light_rounded/btnPrevious.png
	assets/images/prettyPhoto/light_rounded/default_thumbnail.gif
	assets/images/prettyPhoto/light_rounded/loader.gif
	assets/images/prettyPhoto/light_rounded/sprite.png
	assets/images/prettyPhoto/light_square/btnNext.png
	assets/images/prettyPhoto/light_square/btnPrevious.png
	assets/images/prettyPhoto/light_square/default_thumbnail.gif
	assets/images/prettyPhoto/light_square/loader.gif
	assets/images/prettyPhoto/light_square/sprite.png
	bamboo.php
	includes/debug-enabled.php

Signed-off-by: Elliot Taylor <elliot@raison.co>