django 1.5.2
Merge branch 'master' of github.com:ijlizaran/django-schedule

Conflicts:
	AUTHORS
	project_sample/settings.py
	project_sample/site_media/schedule/css/schedule.css
	project_sample/templates/homepage.html
	project_sample/urls.py
	schedule/feeds/__init__.py
	schedule/forms.py
	schedule/models/events.py
	schedule/templates/profiles/schedule.html
	schedule/templates/schedule/_day_cell.html
	schedule/templates/schedule/_month_table.html
	schedule/templates/schedule/calendar.html
	schedule/templates/schedule/calendar_day.html
	schedule/templates/schedule/calendar_list.html
	schedule/templates/schedule/calendar_month.html
	schedule/templates/schedule/calendar_tri_month.html
	schedule/templates/schedule/calendar_week.html
	schedule/templates/schedule/calendar_year.html
	schedule/templates/schedule/cancel_occurrence.html
	schedule/templates/schedule/create_event.html
	schedule/templates/schedule/delete_event.html
	schedule/templates/schedule/edit_occurrence.html
	schedule/templates/schedule/event.html
	schedule/templates/schedule/occurrence.html
	schedule/templatetags/scheduletags.py
	schedule/urls.py
	schedule/utils.py
	schedule/views.py
Merge pull request #1 from ilizaran/master

Master