Added new data_type and date_format fields
Merge branch 'development' of github.com:Wordseer/wordseer_flask into metadata-types

Conflicts:
	app/models/property.py
Merge branch 'development' of github.com:Wordseer/wordseer_flask into metadata-types
Trying to fix travis error
Merge pull request #159 from Wordseer/metadata-types

Metadata types
fixed counter bug and added count check
Merge branch 'development' of github.com:Wordseer/wordseer_flask into nose