Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Fix for bundle controller bug
fixes
Can't catch a break
Fix for multi locale files loading bug
Bug fix bundle loader (numeric instead of associative)
array list to object for convenience
Bug fix
yet another bug fix
Hope this one is the last
Bundle loader was not loading models
View uses all lowercase template file names
Rewrote the convertSmartQuotes