Initial
Merge branch 'mine-master'

Conflicts:
	.gitignore
	Htpc.py
	README.md
	htpc/proxy.py
	htpc/root.py
	htpc/updater.py
	initd
	interfaces/default/css/dash.css
	interfaces/default/css/font/fontawesome-webfont.eot
	interfaces/default/css/font/fontawesome-webfont.svg
	interfaces/default/css/font/fontawesome-webfont.ttf
	interfaces/default/css/font/fontawesome-webfont.woff
	interfaces/default/css/sickbeard_view.css
	interfaces/default/html/base.html
	interfaces/default/html/couchpotato.html
	interfaces/default/html/dash.html
	interfaces/default/html/search.html
	interfaces/default/html/settings.html
	interfaces/default/html/sickbeard_view.html
	interfaces/default/js/couchpotato.js
	interfaces/default/js/dash.js
	interfaces/default/js/default.js
	interfaces/default/js/libs/holder.js
	interfaces/default/js/search.js
	interfaces/default/js/settings.js
	interfaces/default/js/sickbeard_view.js
	interfaces/default/js/xbmc.js
	libs/cherrypy/LICENSE.txt
	libs/cherrypy/cherryd
	libs/cherrypy/test/sessiondemo.py
	libs/cherrypy/test/static/has space.html
	libs/cherrypy/test/static/index.html
	libs/cherrypy/test/test_session.py
	libs/cherrypy/tutorial/README.txt
	libs/cherrypy/tutorial/tutorial.conf
	libs/formencode/i18n/FormEncode.pot
	libs/formencode/i18n/cs/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/de/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/el/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/es/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/et/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/fi/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/fr/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/it/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/ja/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/lt/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/msgfmt.py
	libs/formencode/i18n/nb_NO/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/nl/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/pl/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/pt_BR/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/pt_PT/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/ru/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/sk/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/sl/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/tr/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/zh_CN/LC_MESSAGES/FormEncode.po
	libs/formencode/i18n/zh_TW/LC_MESSAGES/FormEncode.po
	libs/sqlobject/manager/command.py
	libs/sqlobject/maxdb/maxdbconnection.py
	libs/sqlobject/maxdb/readme.txt
	modules/search.py
	modules/sickbeard.py
	modules/utorrent.py
	modules/xbmc.py