change random number to block number
include setup form in block
change version
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