local commit
fix conflict
Merge remote-tracking branch 'XTUPLE/master'
Merge remote-tracking branch 'XTUPLE/master'
Merge remote-tracking branch 'XTUPLE/4_6_x'
working development environment with updated documentation to follow
update Vagrantfile
update Vagrantfile
Merge pull request #29 from gpazo/qtdevtools

Qtdevtools