Added comments for proposed changes in controllers
sync
Merge branch 'master' of https://github.com/Wordseer/wordseer_flask into HMJ-XML-Mapper
Added support for data types, date formats and combined text
Merge origin/HMJ-XML-Mapper into HMJ-XML-Mapper
Added travis button
Added documentation badge
bug fixes. Will add documentation next
'sync'
Merged in tagger
Fixed bad formatting.
Fixed URL for docs
Better readme instructions
Merge branch 'master' of github.com:Wordseer/wordseer_flask into reduce-db-queries

Conflicts:
	app/uploader/views/views.py
Merge pull request #100 from Wordseer/reduce-db-queries

Added comments for proposed changes in controllers
Merge pull request #115 from Wordseer/better-buttons

Better buttons
Merge branch 'sentence_error_handling' of github.com:Wordseer/wordseer_flask
Revert "Merge branch 'sentence_error_handling' of github.com:Wordseer/wordseer_flask"

This reverts commit 2f73b9b779b3567721025c9c9545449def9712c6, reversing
changes made to 083c3b1d8a1c574d68bbbd611f7e58eeb8d88a68.
Bug fixes and updated documentation
Updated documentation