Bumped version

Merge remote-tracking branch 'origin/develop' into 2.0

# Conflicts:
#	.gitignore
#	app/config/production/session.example.php
#	app/config/staging/session.example.php
#	app/config/version.php
#	app/models/User.php

Merge pull request snipe#861 from strand/patch-1

Update Code of Conduct to Contributor Covenant 1.1.0

Fixes snipe#818, and randomizes password for dummy user

Merge branch 'patch-5' of https://github.com/DanielNemanic/snipe-it i…

…nto DanielNemanic-patch-5

# Conflicts:
#	app/views/backend/models/view.blade.php

Updated language strings for slack

Fixes snipe#645 - adds zip and rar to filetype

Merge remote-tracking branch 'origin/develop'

Bumped version for release

Merge remote-tracking branch 'origin/develop'