Merge pull request #133 from hmert/master

merge
Merge pull request #136 from hmert/master

merge
Merge pull request #144 from hmert/master

merge for api
admin journal list tiny ui fixes
bower.json updated /  bootstrap-tour added
assetic configuration updated /  bootstrap-tour added
User entity updated
- new field added as "settings" to store json encoded user settings
user entity minor fix
typo
submission step1 tpl html error fixed
resume submission method
submission steps ui improvements
submission steps ui fixes
fix #145
typo
apidoc
Merge pull request #151 from hmert/master

merge
Merge pull request #152 from hmert/master

twig:page value setted by default
Merge pull request #153 from hmert/master

panel divs removed #142
resolved conflicts