ok
add column to bulletins
merge
fix conflick
fix api
fix rms 22082014
Merge branch 'master' of github.com:github15693/rms
Merge branch 'khanh'