Merge pull request #37 from Troilk/feature_filter_by_role

Filter by role, tests for edit current user and much more...
Dialogs improvements
Dialogs improvements. Test fix and fix error with spec_helper (cannot load file)
Dialogs improvements. Fixed typos and errors, which occured due to spec_helper.rb fail
Merge pull request #38 from apricis/dialogs_fixing

Dialogs improvements
add messages about arrors
Merge pull request #39 from Ruslan207/group_management

add messages about arrors
create link between user and group
bugfix
bugfix of bugfix
Add newer attachments model
Use different layout for client and admin
Make dialog page nicer
Fix bugs with timeago plugin
Merge pull request #41 from Ruslan207/user-group_link

create link between user and group
Merge branch 'add_attachments_model' of https://github.com/zorg-kirill/AcDP into zorg-kirill-add_attachments_model

Conflicts:
	db/schema.rb
Fixing confilicts
Add documents model
Merge branch 'master' of https://github.com/KPI-ASOIU/AcDP
Mergin with remote