Bumped version

Bumped version number

Merge branch 'release-2.5.2'

Conflicts:
	app/Http/Controllers/AppController.php
	app/Http/routes.php
	app/Models/Account.php
	app/Models/Invitation.php
	composer.json
	composer.lock
	resources/lang/de/texts.php
	resources/lang/fr/texts.php
	resources/views/header.blade.php

Bumped version to 2.5.1.3

Updated version number

Merge branch 'release-2.5.1.1'

Merge branch 'release-2.5.1'

Conflicts:
	app/Ninja/Mailers/ContactMailer.php

Bumped version to 2.5.0.4

Merging changes

Merge branch 'release-2.5.0.2'

Conflicts:
	app/Http/Controllers/ClientApiController.php