local commit
fix conflict
Merge remote-tracking branch 'XTUPLE/master'
Merge remote-tracking branch 'XTUPLE/master'
Merge remote-tracking branch 'XTUPLE/master'
Merge pull request #14 from xtuple/4_4_x

Merge 4_4_x into 4_5_x
Merge remote-tracking branch 'XTUPLE/master'
Merge pull request #10 from xtuple/master

Merge readme changes
added support for vmware
Merge remote-tracking branch 'origin'
Issue # 23879: Cleaned up demo folder for Sales Demo
removed provisioning file
Merge pull request #16 from lynnaloo/master

Updated README with new documentation standard. Added Vmware Fusion support.
Changed Vagrant/VirtualBox versions
Merge pull request #20 from xtuple/master

Update 4_5_x
Added 1.6 vagrant up message
Merge pull request #19 from lynnaloo/master

Update xtuple-vagrant dev setup
Merge pull request #22 from xtuple/4_5_x

4 5 x
Merge pull request #24 from xtuple/4_5_x

4 5 x
Updated Vagrantfiles