Merge branch 'installed' of https://github.com/sociam/indx into service_test

To get the on boot setting to work
New Controller Structure
	modified:   apps/service_twitter/bin/run.py
	new file:   apps/service_twitter/bin/service_controller_twitter.py
	modified:   apps/service_twitter/bin/service_tweets.py
	modified:   apps/service_twitter/manifest.json
Twitter Service on boot, Facebook App template added
	new file:   apps/service_facebook/bin/run.py
	new file:   apps/service_facebook/bin/service_controller_facebook.py
	new file:   apps/service_facebook/bin/service_facebook.py
	new file:   apps/service_facebook/html/css/blank.less
	new file:   apps/service_facebook/html/css/service_twitter.less
	new file:   apps/service_facebook/html/img/icon-128.png
	new file:   apps/service_facebook/html/img/icon-512.png
	new file:   apps/service_facebook/html/index.html
	new file:   apps/service_facebook/html/js/service_facebook.js
	new file:   apps/service_facebook/manifest.json
	new file:   apps/service_facebook/old/__init__.py
	modified:   apps/service_twitter/manifest.json
	deleted:    apps/service_twitter/__init__.py
	deleted:    apps/service_twitter/bin/OLDservice_tweets.py
	deleted:    apps/service_twitter/bin/service_tweets (copy).py
Major Fix on Both Twitter and Facebook Service, Now getConfig Works
Facebook v0.1 works to authenticate with a user and exhange for a 60 day token!
	new file:   apps/service_facebook/bin/facebook.py
	modified:   apps/service_facebook/bin/run.py
	new file:   apps/service_facebook/bin/runOLD.py
	modified:   apps/service_facebook/bin/service_controller_facebook.py
	modified:   apps/service_facebook/bin/service_facebook.py
	new file:   apps/service_facebook/html/channel.html
	renamed:    apps/service_facebook/html/css/blank.less -> apps/service_facebook/html/css/service_facebook.less
	deleted:    apps/service_facebook/html/css/service_twitter.less
	modified:   apps/service_facebook/html/index.html
	modified:   apps/service_facebook/html/js/service_facebook.js
	modified:   apps/service_facebook/manifest.json
	deleted:    apps/service_twitter/__init__.py
	deleted:    apps/service_twitter/bin/OLDservice_tweets.py
	modified:   apps/service_twitter/bin/run.py
	deleted:    apps/service_twitter/bin/service_tweets (copy).py
	modified:   apps/service_twitter/html/js/service_twitter.js
	new file:   blank.log
	new file:   fitbit_harvester.log
Updated HTML
	modified:   apps/service_facebook/html/css/service_facebook.less
	modified:   apps/service_facebook/html/index.html
	modified:   apps/service_twitter/html/index.html
Facebook working
	modified:   apps/service_facebook/bin/run.py
	modified:   apps/service_facebook/bin/service_controller_facebook.py
	modified:   apps/service_facebook/bin/service_facebook.py
Merge branch 'installed' into service_test

Conflicts:
	apps/blank/manifest.json
commited
Last commit before merge
Merge branch 'master' into service_test
Done!
Merge branch 'master' into service_test
Removed old facebook app
Merge branch 'master' into service_test
Trying out reactor
Merged with Master
twitter work

Merge branch 'service_test' into emax
added manifest back to json
cosmetic icons