Ajax, jquery
More bootstrap changes
Merge conflict sorted
amount params can go through
...
Fixed merge conflict