Asset tab added
changelog updated
import ralph_assets module - probably better way
asset tab - remove icons
Bumped Django version
Bumped dnspython version to 1.11.0
Merge branch 'dev' of https://github.com/quamilek/ralph into dev
Merge branch 'master' of https://github.com/allegro/ralph into dev
Bumped pytz version to 2013b
asset tab - select asset form added
add device form - select asset if module ralph_assets enabled added
fix conflicts and merge
Add logging to manual scan
Merge branch 'master' of github.com:allegro/ralph

Conflicts:
	src/ralph/scan/manual.py
snmp_macs plugin - added support for vmware and modular blade
Merge pull request #623 from deshipu/master

Add logging for manual scanning
Merge pull request #619 from quamilek/master

Bumped packages version
after review fixes
Merge pull request #622 from andrzej-jankowski/snmp_macs

snmp_macs plugin improvements
after review fixes