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'

Merge remote-tracking branch 'origin/develop'

Fixes checkin button on view

Squashed commit of the following:

commit 95ae26e
Author: snipe <[email protected]>
Date:   Sun Feb 8 16:21:33 2015 -0800

    Updated docs location

commit cfebe11
Author: snipe <[email protected]>
Date:   Sun Feb 8 16:20:36 2015 -0800

    Updated docs for 4.2

commit d86b5aa
Author: snipe <[email protected]>
Date:   Sun Feb 8 16:20:24 2015 -0800

    Bumped version

Nicer display if no files have been uploaded