elementary 2.1.0

merging dev branch with master branch