fix .gitignores
changed some icons
add notification
added datepicker
resolve conflict
merge master to simon
datepicker fix