updated gitignore

updated folder references to be based from the root
added wireframe asset file
added missing assets files due to improper gitignore
added missing jtagit files
adding missing xupload assets
tmp
Merge branch 'master' of https://github.com/benrowe/Simple-CMS

Conflicts:
	protected/components/AdminController.php
	protected/components/Dir.php