Merge branch 'dev'
twitter added
Merge branch 'master' into dev
changed specs