Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Amended version number.
merged develop branch
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
upgraded DI/1
Merge branch 'develop'
Merge branch 'develop'
Xindi release
Merge pull request #112 from aliaspooryorik/develop

Develop
release preparation
Xindi release
fixed conflicts
fixed conflicts
Updated to version 2.3 of Bootstrap.
amended setup instructions
user interface enhancements