added APP
upgraded bootstrap
Merge branch 'dev' into staging
changed index to fixed version
Merge branch 'dev' into staging
Merge branch 'staging'
social
Merge branch 'dev' into staging

Conflicts:
	index.html
Merge branch 'staging'