Merge pull request #101 from ialja/master

select existing audience and theme choices got lost in merge
fixing bootstrap social imports on sass
Merge pull request #103 from ercchy/master

fixing bootstrap social imports on sass
Merge remote-tracking branch 'upstream/master'