Update README.md
aded new files
Lots of minor changes, bug fixes and small changes to the package manager.
Update README.md
fixed conflict
changes to readme
changes
Merge branch 'dev1.2' into beta
changes
Merge branch 'beta'