django cron
Merge branch 'master' of 192.168.5.102:~/ccf into feature-seven
seven
topology
slice
slice Merge branch 'master' of 192.168.5.102:~/ccf into feature-seven

Conflicts:
	etc/config.py
	plugins/ipam/models.py
	slice/models.py
	slice/slice_api.py
slice
slice topology
Merge branch 'master' of 192.168.5.102:~/ccf into feature-seven
slice topology
Merge branch 'master' of 192.168.5.102:~/ccf into feature-seven
switch port
slice topology
topology
slice topology
add extra field for user with profiles
project slice
slice erge branch 'master' of 192.168.5.102:~/ccf into feature-seven

Conflicts:
	ccf/static/js/slice_topology.js
slice
Merge branch 'master' of 192.168.5.102:~/ccf into feature-seven