Merge branch 'hotfix/bootstrap_timepicker' into develop
Merge branch 'hotfix/bootstrap_timepicker_2' into develop
added ico version of favicon
Merge branch 'develop'