Bug fix

	* Fix bugs on last commit
Merge branch 'develop' of github.com:Baaam/Tickts into develop