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
Merge pull request #30 from xtuple/4_6_x

4 6 x
clarify folder structure and update README
whoops fix'd
Merge pull request #31 from gpazo/qt-desktop

clarify folder structure and update README
Merge pull request #32 from xtuple/4_6_x

4 6 x
Removed unused folder and fixed README.MD links
Merge pull request #34 from lynnaloo/fix-links

Removed unused folder and fixed README.MD links
update path to new xtuple-desktop folder
Merge pull request #35 from gpazo/updateDocs

update path to new xtuple-desktop folder
Merge pull request #36 from xtuple/4_6_x

4 6 x
Update Vagrantfile