initial commit of live code
Merge remote-tracking branch 'github/master'

Conflicts:
	.htaccess
	api/upload.php
	index.php
	init.php
	library/Bcode.php
	library/Template.php
	template/template.php
Removed additional files not in version 2.
Merge remote-tracking branch 'github/master'
Removed unnecessary 'if' statements from nginx rewrite rules.  Added a 'RewriteBase' line to the Apache rules for clarity.