changes
Merge branch 'development'
credit spend logic
removed conflicts
Merge branch 'development'