Created date input
Fixed merge conflict
Merge branch 'dev' of github.com:Label305/Auja into feature_input-date
Merge pull request #25 from Label305/feature_input-date

Created date input