Dev

merging branch dev with master. Added configurations and new gems in dev branch