reformat and clean code ; go to deploy
change gitignore
remove scss files
Merge branch 'dev'

Conflicts:
	blocks/event_calendar/templates/blue/css/eventCalendar_theme_blue.css
	blocks/event_calendar/templates/blue/sass/eventCalendar_theme_blue.scss
	blocks/event_calendar/templates/blue_pl/css/eventCalendar_theme_blue.css
	blocks/event_calendar/templates/blue_pl/sass/eventCalendar_theme_blue.scss
	blocks/event_calendar/templates/green/css/eventCalendar_theme_green.css
	blocks/event_calendar/templates/green/sass/eventCalendar_theme_green.scss
	blocks/event_calendar/templates/green_pl/css/eventCalendar_theme_green.css
	blocks/event_calendar/templates/green_pl/sass/eventCalendar_theme_green.scss
	blocks/event_calendar/templates/red/css/eventCalendar_theme_red.css
	blocks/event_calendar/templates/red/sass/eventCalendar_theme_red.scss
	blocks/event_calendar/templates/red_pl/css/eventCalendar_theme_red.css
	blocks/event_calendar/templates/red_pl/sass/eventCalendar_theme_red.scss
remove scss from master tree
Merge branch 'dev'

Conflicts:
	blocks/event_calendar/controller.php
Merge branch 'dev'

Conflicts:
	blocks/event_calendar/templates/blue/view.php
	blocks/event_calendar/templates/blue_pl/css/eventCalendar.css
	blocks/event_calendar/templates/blue_pl/css/eventCalendar_theme.css
	blocks/event_calendar/templates/blue_pl/css/eventCalendar_theme_responsive.css
	blocks/event_calendar/templates/blue_pl/js/jquery.eventCalendar.js
	blocks/event_calendar/templates/blue_pl/view.php
	blocks/event_calendar/templates/green/view.php
	blocks/event_calendar/templates/green_pl/css/eventCalendar.css
	blocks/event_calendar/templates/green_pl/css/eventCalendar_theme.css
	blocks/event_calendar/templates/green_pl/css/eventCalendar_theme_responsive.css
	blocks/event_calendar/templates/green_pl/js/jquery.eventCalendar.js
	blocks/event_calendar/templates/green_pl/view.php
	blocks/event_calendar/templates/red/view.php
	blocks/event_calendar/templates/red_pl/css/eventCalendar.css
	blocks/event_calendar/templates/red_pl/css/eventCalendar_theme.css
	blocks/event_calendar/templates/red_pl/css/eventCalendar_theme_responsive.css
	blocks/event_calendar/templates/red_pl/js/jquery.eventCalendar.js
	blocks/event_calendar/templates/red_pl/view.php
Update README.md
Merge branch 'dev'

Conflicts:
	blocks/event_calendar/controller.php
	blocks/event_calendar/templates/blue/css/eventCalendar_theme_blue.css
	blocks/event_calendar/templates/blue/view.php
	blocks/event_calendar/templates/blue_pl/css/eventCalendar.css
	blocks/event_calendar/templates/blue_pl/css/eventCalendar_theme.css
	blocks/event_calendar/templates/blue_pl/css/eventCalendar_theme_blue.css
	blocks/event_calendar/templates/blue_pl/css/eventCalendar_theme_responsive.css
	blocks/event_calendar/templates/blue_pl/js/jquery.eventCalendar.js
	blocks/event_calendar/templates/blue_pl/view.php
	blocks/event_calendar/templates/green/css/eventCalendar_theme_green.css
	blocks/event_calendar/templates/green/view.php
	blocks/event_calendar/templates/green_pl/css/eventCalendar.css
	blocks/event_calendar/templates/green_pl/css/eventCalendar_theme.css
	blocks/event_calendar/templates/green_pl/css/eventCalendar_theme_green.css
	blocks/event_calendar/templates/green_pl/css/eventCalendar_theme_responsive.css
	blocks/event_calendar/templates/green_pl/js/jquery.eventCalendar.js
	blocks/event_calendar/templates/green_pl/view.php
	blocks/event_calendar/templates/red/css/eventCalendar_theme_red.css
	blocks/event_calendar/templates/red/view.php
	blocks/event_calendar/templates/red_pl/css/eventCalendar.css
	blocks/event_calendar/templates/red_pl/css/eventCalendar_theme.css
	blocks/event_calendar/templates/red_pl/css/eventCalendar_theme_red.css
	blocks/event_calendar/templates/red_pl/css/eventCalendar_theme_responsive.css
	blocks/event_calendar/templates/red_pl/js/jquery.eventCalendar.js
	blocks/event_calendar/templates/red_pl/view.php
Merge branch 'master' of github.com:dszymczuk/dsEventCalendar

Conflicts:
	blocks/event_calendar/templates/blue/view.php
	blocks/event_calendar/templates/green/css/eventCalendar_theme_green.css
	blocks/event_calendar/templates/green/view.php
	blocks/event_calendar/templates/red/css/eventCalendar_theme_red.css
	blocks/event_calendar/templates/red/view.php
Merge branch 'dev'
change license:

dsEventCalendar - Creative Commons
jQuery Event Calendar Plugin - GPL v3
change controller version
change number version
remove unnecessary js files from templates
add release todo
resolve conflict
remove todo_release
resovle conflicts
fix display event on FF and IE