first commit
remove non template files and directories
Twitter stream credentials adapted
Twitter stream credentials adapted
Twitter stream credentials adapted
first commit
Merge branch 'Production/master'

Conflicts:
	jacky/.gitignore
	jacky/index.php
	jacky/twitter_oauth/search.php
	jacky/twitter_oauth/user_timeline.php
Merging backup repos
Merging backup repos
Merging backup repos
Merging backup repos
fix
fix
Backup merges and twitter credentials fixed - stable
Twitter credentials: www prefix added