Conflict resolved
Don't work
Merge branch 'master' of https://github.com/the12chairs/freelens.us

Conflicts:
	.idea/workspace.xml
	protected/migrations/m140730_063020_create_orders_table.php
	protected/migrations/m140730_063732_create_schedule_table.php
edited git ignore