initial commit
Nav and user edit updated
Update README.
deletes
merge from dev
Removed modified config files
line endings
minor CSS formatting
Merge PR #1015 Bootstrap 3.1.1