Merge branch 'master' into dftaiwo
.
Merge remote-tracking branch 'hotoracle/master'
Formatted code
Fixed path issue with bootstrap
Fixed Path to FB/Twt/G logins