shifted attachment table down
parent licence as autoselect
Button to edit licences
minor layout fixes
fixed mainmenu & sidebar reflection to showed page
Merge branch 'attachments-shifted-down' into minor-layout-fixes
Merge branch 'develop' into minor-layout-fixes
Merge pull request #202 from kubked/user_edit_licences

Button to edit licences
Merge pull request #200 from kubked/parent_licence_fix

parent licence as autoselect
unhighlighted mainmenu for 'xls upload'
Merge branch 'develop' of https://github.com/allegro/ralph_assets into minor-layout-fixes

Conflicts:
	src/ralph_assets/templates/assets/user_details.html
flake8 ready models.py
flake8 ready import of SoftwareCategory, LicenceType
Merge pull request #201 from quamilek/develop

Update .travis.yml
Merge branch 'develop' into minor-layout-fixes
Merge pull request #203 from xliiv/minor-layout-fixes

Minor layout fixes
Search multiple value in SN, BARCODE, NIV
Merge branch 'develop' of https://github.com/allegro/ralph_assets into develop
added fillables for each bulkedit field beside: sn, barcode, imei
fixed indentions